Skip to content

[GEN][ZH] Check vector size before accessing first element in World Builder MapObjectProps and ScorchOptions #1117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

[GEN][ZH] Check vector size before accessing first element in World Builder MapObjectProps and ScorchOptions #1117

wants to merge 5 commits into from

Conversation

Caball009
Copy link

@Caball009 Caball009 commented Jun 19, 2025 •
edited
Loading

Reproduction steps: Start World Builder (debug build) and tick "Enabled" in the "Object Properties" window. This will result in a debug assertion: "front() called on empty vector".

Notice how a pointer to the first element of m_allSelectedDicts is taken without checking whether the vector is empty or not (line 1436):

GeneralsGameCode/GeneralsMD/Code/Tools/WorldBuilder/src/mapobjectprops.cpp

Lines 1418 to 1441 in 51afe0c

/// Move data from dialog controls to object
void MapObjectProps::_SelectableToDict(void)
{
getAllSelectedDicts();
CButton *owner = (CButton*) GetDlgItem(IDC_MAPOBJECT_Selectable);
Bool isChecked = (owner->GetCheck() == 1);
Bool isTristate = (owner->GetCheck() == 2);
CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
if ( pDoc != NULL )
{
Dict newDict;
if (isTristate) {
newDict.remove(TheKey_objectSelectable);
} else {
newDict.setBool(TheKey_objectSelectable, isChecked);
}
DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
pDoc->AddAndDoUndoable(pUndo);
REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
// Update is called by Do
}
}

I chose to not add size checks everywhere but keep the code functionally the same except calling front() on an empty vector. As long as the vector is empty, the code in DictItemUndoable::DictItemUndoable won't attempt to dereference the front pointer so it can be NULL.

Would need to be replicated in Generals.

TODO

  • Replicate in Generals

@Caball009 Caball009 added Bug Something is not working right, typically is user facing Minor Severity: Minor < Major < Critical < Blocker WorldBuilder Relates to World Builder labels Jun 19, 2025
xezon
xezon reviewed Jun 20, 2025
View reviewed changes
@xezon xezon added this to the Code foundation build up milestone Jun 20, 2025
xezon
xezon approved these changes Jun 21, 2025
View reviewed changes
Copy link

@xezon xezon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

xezon
xezon reviewed Jun 21, 2025
View reviewed changes
@Caball009 Caball009 changed the title [ZH] Check vector size before accessing first element in World Builder MapObjectProps and ScorchOptions [GEN][ZH] Check vector size before accessing first element in World Builder MapObjectProps and ScorchOptions Jun 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xezon xezon xezon approved these changes

Assignees
No one assigned
Labels
Bug Something is not working right, typically is user facing Minor Severity: Minor < Major < Critical < Blocker WorldBuilder Relates to World Builder
Projects
None yet
Milestone
Code foundation build up
Development

Successfully merging this pull request may close these issues.
2 participants
@Caball009 @xezon